am: e6fcfea
* commit 'e6fcfeae6a512b98e52de51fe890327a94fa97b0':
Revert "Temporary changes to fix crashes during tests."
Change-Id: Ie9548fc0cc15f5112e6ce1464313a4717ddfd718
am: e6fcfea
* commit 'e6fcfeae6a512b98e52de51fe890327a94fa97b0':
Revert "Temporary changes to fix crashes during tests."
Change-Id: Ie9548fc0cc15f5112e6ce1464313a4717ddfd718