Merge "make sure package info is non-null" into oc-mr1-dev
am: 63b3eff31a

Change-Id: Ic710dd55d0ed1dbc95d70fe480dc9060b661c051