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

Change-Id: Ifd73501b25b8487dd036abb56252feae6ef96d94