Merge cherrypicks of [12867055, 12867056, 12866007, 12866008, 12866997, 12866998] into rvc-d1-b-release

Change-Id: I1d86147940125b34ee0355c16452a2488cbe030c