Merge commit 'f2c5221771026d9d536e784240f0fbe3374a4b9a' into sc-platform-merge
Change-Id: Ide1eefd58a3160724a30b93812cede4727a965d2