This reverts commit eead637cec. Reason for revert: b/284937144 Change-Id: I0538a9a57f4e202cab9701cb16dbd6ea1e55f859
eead637cec