Merge "Add missing transitive dependencies" into oc-dev