This reverts commit 6f049fef. Reason for revert: b/278008782 Change-Id: I2a01be993da85b0839e8a4590166da526221f643