This reverts commit ac90c919. Reason for revert: b/267275611 Change-Id: Ibd2c5a13734e5384ab277549fa97a601627ce23d