Merge commit '27a378d7ac0744696d6bbee7b40bf1d159d23bc4' into sc-platform-merge
Change-Id: I8b3d9453af7fec06264e8a2d834ac5c952d2bbe6