Merge cherrypicks of [15721650, 15722323, 15721651, 15722211, 15719975, 15722214, 15722327, 15722329, 15722504, 15722519, 15722520, 15722521] into sc-d1-release

Change-Id: I452c659c742d01c02d36cf0c5849d67cd78d8322