Merge commit '43fb2424f017cdb5e8b05b3d89645bd6b9a4718e' into sc-platform-merge
Change-Id: Ic7c8eb8a280654f9e36092bd5d40edf070ed9b72