Merge cherrypicks of [16873141, 16765537, 16713864, 16678490, 17089346, 17112345, 17040109, 17155535, 17147924] into sc-v2-release.

Change-Id: I98c586a6461a162bd6df76cf009e29e012aee58f