Merge cherrypicks of [2749916] into oc-r4-release

Change-Id: Ice4e4b8556ffddcd902769cf50ea4e39f01f4a75