Merge cherrypicks of [14667281, 14664162, 14666944, 14667298, 14667299, 14667300] into sc-release

Change-Id: I17276bd4f9f3cce875b3fbf0721db07dcfbb6296