Merge cherrypicks of [17378326, 17527092, 18298311, 18321334] into sc-v2-release.

Change-Id: I3212e783a843bc3e91b04d4f3f421482a57a2942