Merge commit '057ad22daa578924042e81dc11f705880d95c2db' into sc-platform-merge
Change-Id: Iad2471561eff4c3886502eb3ba6fd78630047214