Merge commit '8607794be869fd2b2d1ce0b9ffa300743d33b6a7' into sc-platform-merge
Change-Id: I0eccf78fd37edd1f94b334f5ffdf91c7bfb1dede