This reverts commit c3ebae4c. Reason for revert: b/257379026 Change-Id: Id5f4cf24fe2a65b70ae5f024c2fcd5f16b92bbb0