Merge cherrypicks of [2749914] into oc-release

Change-Id: I6d252bf421bf47f64c640599abfb08389fe40b86