This reverts commit feb6023c. Reason for revert: Merging together with ag/9895837 will fix the build. Bug: 144453231 Test: build Change-Id: Id1b04efc74bcedfd476e0b2339c4700956d59a28