Merge cherrypicks of [13194182, 13194183, 13194184, 13194185, 13194186, 13194187, 13194188, 13193307, 13194189, 13194236] into sc-release

Change-Id: I8a9b3d91e29d55828c6f67f65f09f028686fc3cc