Merge "make sure package info is non-null" into oc-mr1-dev