Merge cherrypicks of [15104149, 15104283, 15104029, 15103978, 15103979, 15105011, 15105050, 15103823, 15103882, 15105012, 15105051, 15104002, 15103824, 15104202, 15104284, 15104285, 15103980, 15104397, 15104003, 15103794, 15103883, 15105013, 15104036, 15104286] into sc-beta3-release

Change-Id: I76e1b690cd48e1591aaca1339426e0184708b923