Merge commit '3959333720de40f1b43b86affa372a2aee40908a' into sc-platform-merge
Change-Id: I1787a70fb517a69c130dfbaf7f1f4e2854a62574