Merge cherrypicks of [2830125, 2833486, 2833487, 2833488, 2831683, 2831684, 2832961] into oc-mr1-release

Change-Id: Icce1b13dfc3e96ff683970629a70745b89f919e2