Merge commit '24ccdcec9803fd6b5f119288fc26034521402ee9' into sc-platform-merge
Change-Id: Id1adffe379ce9a4602848a91c327c8c0ef4360e4