Merge cherrypicks of [14140464, 14142983, 14142984] into sc-v2-release

Change-Id: I3ddab9d4731ed597b21233c0f52a24c6c4d26acd