This reverts commit 9f956ccf. Reason for revert: b/175198007 Change-Id: Ie35dca0500734ff35781c7344dcc70953f29d174