This reverts commit e3075d67. Reason for revert: It's breaking builds as in b/291333083 Change-Id: I44bae6b132d699c997a0057070b087a521e0d004