This reverts commit 182b56b870. Reason for revert: prime suspect for breaking boot tests b/307495247, b/307411752 Bug:307495247 Change-Id: Iea05703b767d2699ca3cf69377eb44b1d21697ad
182b56b870