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

Change-Id: I2110cc40a3d648bb66da62653d6d8a972bf39761