Merge commit '607d3ddd7b3a36e266dab2f00e01298deffc4285' into sc-platform-merge
Change-Id: I1d65bac7ea3257869e258c943dc175a8d475216d