Merge cherrypicks of [3783687, 3783705, 3783726, 3783751, 3783752, 3783607, 3783727, 3784084] into oc-m4-release

Change-Id: Ia0b33fa48a65a19a871957c550b771f81896261c