Merge "Pass package name as part of startDiscovery"
am: bee9a87193

Change-Id: I30eb9a65e4854eff1539d6d86d3f932675eb2dc2