Merge cherrypicks of [15981390, 15981677, 15981678, 15981679, 15981680, 15981894] into sc-d1-release

Change-Id: I966003b3721c2a357f2dff76bd0d6594e321075a