This reverts commit 34bc567a93. Reason for revert: build failure Change-Id: I67e0270051a82db7f524ed219316f02f2766d6e1
34bc567a93