Merge commit 'c62ed0b859deab81a37bcf0a313bb7c77a249c82' into sc-platform-merge

Change-Id: I0c7248c3b529def6c69b4835827f390bc8468bfd