Merge cherrypicks of [3422737, 3422885, 3422909, 3422910, 3422878, 3423352] into oc-m2-release

Change-Id: I7f763eb7fbf764fb78fb8e16fa38a0f608e51c36