This reverts commit 762850ba. Reason for revert: b/238714871 Change-Id: I5f23a725940f0291ba5cfab1aa6e361c0e6c6ac5