Merge cherrypicks of [15749384, 15749385, 15749021, 15749367, 15749149, 15749150, 15749402, 15748246, 15748540, 15749368, 15749369, 15749386, 15749387, 15749403, 15749404] into sc-release

Change-Id: I854f89bc92ff03fa6d531fb5c5c50edc8a90d5ed