Merge cherrypicks of [2624661, 2624224] into oc-release

Change-Id: I58c397ab4e8a2e64d68337b1a01faa50e39996fe