Merge cherrypicks of [2953251] into oc-r3-release

Change-Id: Iec0e067030ca7151363a2f5313aeaef6bc1a27e5