This reverts commit 21579bec. Reason for revert: Build failure Change-Id: Ia941425b9462f478be78058b3d63a30106421de6