2687257c98
This reverts commit 6c6c2f45f7.
Reason for revert: Temporary revert for build.
Change-Id: I3947e9b2d4e5788f9d2a0c4e2e8b7d425d5bc775