This reverts commit 6898dea5. Reason for revert: b/218243793 Change-Id: Iadc00568b09d0e122eefbe25c0c44820b3c24815