Merge cherrypicks of [16671306, 16681376, 16682150] into sc-v2-release.

Change-Id: I635aedc9fe28cf2e12ad7c217d8fd37c258c1b94