Merge cherrypicks of [17113996] into sc-v2-release.

Change-Id: I07ed5791b84dc68993c5732fe1a9d475a58328e0