Merge cherrypicks of [14667282, 14666945, 14667302, 14667303, 14667304] into sc-v2-release

Change-Id: Idc48cc81438f90487f6a38ca95d44e425a0a0055