Merge commit 'd2491076c6eb8e887e291e2387f3fbff3a8bb615' into sc-platform-merge
Change-Id: I4adf546af794809ff967aaab53056b0d0c316b62