Merge cherrypicks of [3743586, 3743312, 3743562, 3744001, 3744021, 3744022, 3744041, 3744042, 3744043, 3744023, 3744024, 3744025, 3744002, 3744003, 3744081, 3744082, 3744083, 3744084, 3744101] into oc-m2-release

Change-Id: I5a0f040539ca6285240966a365b19ce917416f5a