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

Change-Id: I3f98004273dd3f6e8226fb1abe71c0773a35dc4c