Merge cherrypicks of [3368067, 3367704, 3367466, 3367467, 3368164, 3368165, 3368166, 3368148, 3368149, 3368279, 3368280, 3368281, 3368127, 3368068, 3368339, 3368340, 3368150, 3368151, 3368341] into oc-m3-release

Change-Id: I17c751028a31cffc22a5d703a13ce66c4638418b