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

Change-Id: Ibe9b0dedfac6bc5ab1a9f67273f6f7c947a89cd2