This reverts commit 1eb330c1. Reason for revert: build failure in git_master/apps Change-Id: Ia76a38dc2223f4c969bf4ec5f95ca2e0e214d1e9