This reverts commit 1e9c2677. Reason for revert: Break build Bug: 161315642 Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5