Merge cherrypicks of [15671342, 15671402, 15670951, 15671362, 15671363, 15671364, 15671365, 15671366, 15671343, 15671344, 15671345, 15671346, 15671347, 15671367, 15671368, 15671369, 15671370] into sc-d1-release

Change-Id: I9df7e3c9c1258ef6d14580b8eb59156d4b3fae0b