Merge commit '5c77280507dad341b8c03113023866eb652659ad' into sc-platform-merge
Change-Id: Ia4fc26c0320f8ed9c0a97c30380a7eb86ad5e827