This reverts commit bb158a34. Reason for revert: b/253035046 Change-Id: Id0fc9251283a7fba2eee5e18aecb16ddf80c6253