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

Change-Id: I8dee413204c52bd715403d13696939930220cb10