This reverts commit b53036a6. Reason for revert: Testing for b/175673373 Change-Id: I6b142ce6a7174faf343996e2d92a29bf5a0965ca