Merge cherrypicks of [2783915, 2783051, 2783955, 2783916] into oc-dr1-release Change-Id: Ic2d5f8393a5fc180225cc4db609c96f24a1669d6