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

Change-Id: Ib77ecabcb1e481361af1eb71bcea01006d52e2c8