Merge cherrypicks of [2507192] into oc-release

Change-Id: I056e9eb24334d18b675c71d452f521973c4a82ed