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

Change-Id: I60f3d0e767313841cc91672e9b98b401607c4d68