This reverts commit c5882bcdfc. Reason for revert: b/281068877 Change-Id: I431678658fc464c995df0df5e3cac5491d91b052
c5882bcdfc