Support multiple ways to provide package name am: 1cb9106e2e am: 0db4042a73
am: 6b4b6b10ca

Change-Id: I0592802d3ab2a2380b59eb00b0ece2c44cd2ba81