Merge commit '954f3a807213fa425bb7d49ab4a793e5201ccc18' into sc-platform-merge
Change-Id: Iae7caf9c421079cd3742f1dbc8514311dd0f6f67