Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev