Merge cherrypicks of [16664218, 16664219, 16664220] into sc-v2-release.

Change-Id: I7e565a830c9e357a0a6fd78853e1d5a6fcf38a59