This reverts commit dc979249. Reason for revert: broke emulator b/121038163 Change-Id: I3c93fe7d91431a3000094915c909811d1796305d