This reverts commit b81814a7. Reason for revert: breaking build 9271471 Change-Id: I1876f45b79779d7e8ec46a78bf71bf7fec09e62b