Merge commit 'bb72e9782d08218acbd649b57ae3f3fe71913bcd' into sc-platform-merge
Change-Id: Id4d7d00fb01ea1159891040b390224729df44d5c