This reverts commit 562b9818. Reason for revert: build failure in git_master/apps Change-Id: Ifb2aa64a5decff19b9c2925b44e0cfb1c04b08d4