This reverts commit 4c980fe0. Reason for revert: b/146116098 Change-Id: Ifafe0542e91661e52662d711a848996cbb3f57c8