This reverts commit 7eb315903c.
Reason for revert: build failure in git_master/apps
Change-Id: Ibdc38781d46fd11d62d964dd712c51fc5a1b1b9b
This reverts commit 7eb315903c.
Reason for revert: build failure in git_master/apps
Change-Id: Ibdc38781d46fd11d62d964dd712c51fc5a1b1b9b