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

Change-Id: I6bfc7638d6f4e3487ece2452743c68150aaaf754