This reverts commit 9740d55e. Reason for revert: b/284406751 Change-Id: If035d17ff5824b113e0612ea9e0fec52c1866c57