Merge commit 'c89a10219c11a48cf78599c23e19fe11fb0e5f4d' into sc-platform-merge
Change-Id: I361463fe09175207b46f9167b98ec3ddd5124720