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

Change-Id: I65a667022753cb91db678227ea212de53fc25ec6