Merge cherrypicks of [14314690, 14314560] into sc-v2-release

Change-Id: I31ec6f37c719faf09ae511b12d8b53564ad83879