Merge cherrypicks of [16634161, 16660805, 16663773, 16636785, 16630306] into sc-v2-release.

Change-Id: Id2dbb9735d18687cea76640d5e1fa97509751b97