This reverts commit b3dacf3d. Reason for revert: Build Fail (ab/6143227) Change-Id: I456d1ffe4a9760e65f91c37cd67bb9e9daabcc8e