This reverts commit 8a4547a7. Reason for revert: build failure Change-Id: I9016e3a1cf73c4a1e2ea778b862829c4901983e9