This reverts commit 7aa18112. Reason for revert: b/132891091 Bug: 132891091 Change-Id: I7775bfe2d0c65908f0f6ec14e52beaf58528e19a