Bug: 138422309 This reverts commit 390d9e6a. Reason for revert: crashes documented in b/138422309 Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8