Merge commit 'b5d58f2e82ce7c573bfd56b86c7e7d4af05356f5' into sc-platform-merge
Change-Id: Id8b5caf5cf729a6ebae6c9dd39d2688ade461eed