Merge cherrypicks of [2805728, 2805966] into oc-r5-release

Change-Id: I6062dd3859b7db54443bb63c7f2a7641c16b255b