Merge "Remove using package name" into oc-mr1-dev