This reverts commit 48b3b3c7. Reason for revert: breaks emulator BUG: 146558375 Change-Id: I2af3d11ad9a014b0d73a73540bc814f245bc6418