16dcfcd9ec
Remove unnecessary module-level mocks and replace them with test-specific mocks so they don't persist through the entire test suite. Partial-Bug: #1316401 Change-Id: I49039749bb700ec0a88639f4772701ba3b920352