Merge cherrypicks of [15712549, 15712550, 15712551, 15712641, 15712642, 15712643, 15710166, 15711786, 15711787, 15711788, 15711789, 15712646, 15712631, 15712552, 15712632, 15712633, 15712634, 15712559, 15712560, 15712561] into sc-d1-release

Change-Id: I449b6903ca77328db600a1cd1a016f5ae25eb4a5