This reverts commit dc4aa4b8. Reason for revert: cause of b/188239482 Change-Id: Iff8d07e48d3521c7b62f6bb64b01712611f886d7