Merge "Fix potential build break" into oc-dev