Merge cherrypicks of [16685428, 16688543, 16684091] into sc-v2-release.

Change-Id: If86b1acade6ad30900ecf35f9dc7b9afa223723e