Merge cherrypicks of [14446716] into sc-release

Change-Id: I04bcdeae7b7479370c9193b999327d1863f756cc