Merge cherrypicks of [2804820, 2804821] into oc-r4-release

Change-Id: Ie82b89ec161e2ff7996c190a2b1220b67948a59c