Merge cherrypicks of [3027689] into oc-mr1-release

Change-Id: I4723a3cd7e9b85ca623250d8a6ae7ea5a15b645f