Merge cherrypicks of [13819126, 13819127, 13818519] into sc-v2-release

Change-Id: I65404e7a41ca69478fad83d00045349db7e29a34