Merge commit 'e37190d6d082210d0f4401af3d0a6fe01bc846a5' into sc-platform-merge
Change-Id: I1f9ba315e620d02d38d29a5549979168e74bedd8