Merge cherrypicks of [14650083, 14650280, 14650281, 14650282, 14650330] into sc-release

Change-Id: I5f43de4def28a4344a5afcdae69db5440411536d