Merge commit '30450cb2a561e09d493231f4723b0653e9e070ac' into sc-platform-merge
Change-Id: I3ce093d646382484c59a5b812add8930102e8824