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

Change-Id: Ic02449412cbb9580b91b7174650150121414a230