Merge cherrypicks of [14457741, 14457345, 14457244, 14457302] into sc-v2-release

Change-Id: I07cdd377d9f09e90f37525ce5d1bc98391610b0e