Merge "also verify existence of a package" into oc-mr1-dev
am: 8cfb2f6310

Change-Id: Id4b48184275d44b5de3bf459375ca2dae3fb0eb7