Merge commit 'da7f6052bfd5d9d8778ad28ae923a8317f114a97' into sc-platform-merge
Change-Id: Ic5bbc208de634691fecdee023817d568ddd95e80