Merge cherrypicks of [2627701] into oc-release

Change-Id: I13dba40107ad2acef7dbe717fcd01f39dbc9ad49