Merge cherrypicks of [16668784, 16664941, 16719697, 16461958, 16612527, 16742068, 16778744, 16827478] into sc-v2-release.

Change-Id: I7c3f4c87f00e23c9955a09c8c120f5372135561e