Merge cherrypicks of [15605627, 15607206, 15607301, 15607207, 15606407, 15607147, 15605835] into sc-d1-release

Change-Id: I8b2dfdca3f00b87a090c339a88abc226beccadc3