Bug: 138422309 This reverts commit 20ab1e34. Reason for revert: crashes documented in b/138422309 Change-Id: Ic9e33fdb24bad2b30f0eb357d6752c1834df41d5