Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: I0a71668cc1c1238ce5b82f282c2f7be155ef2f9f