Merge cherrypicks of [3775466, 3774310, 3774548, 3774358, 3774359, 3774360, 3774361, 3774362, 3774363, 3775784, 3775785, 3775786, 3775787, 3775788, 3775789, 3774751, 3774549, 3774202, 3774203, 3774752] into oc-m2-release

Change-Id: I707b4cfe725ef37086f44d85f75625d7a4d66de0