Revert "resolve merge conflicts of a8ebd89cdb11dbedfff2a55346f936ff9c9f5259 to sc-dev"

This reverts commit 03f060702a8d064f6fa9b2f79de56eea2dc61fdd.

Reason for revert: Build break commit has been reverted.

Change-Id: Ie80a4173e92709a2ab75c6c2174adacf58c2f776
2 files changed