Merge commit 'be83941ab342e8f23734daefb2e082a28eb04cf7' into sc-platform-merge
Change-Id: I438455acfc1a08d6d13eba99604e4ebc14cf0c2a