Merge commit 'fd2717cc71ca4329637522a39e80e1211dd5c70d' into sc-platform-merge
Change-Id: Ibe4c95794854f15ac49c0d2dc09242a5490dba98