Merge commit '785573103fe0d63765b1c1a6b2021a8ed91d6b49' into sc-platform-merge
Change-Id: I5c08146fff060da94df080571f5d69f52edf60d8