Merge cherrypicks of [3791347] into oc-m2-release

Change-Id: I0636ae858dcee435df462983595f1e3561fa7ca2