Merge "Pass in external packageName"
am: 1764f6a49e

Change-Id: I39d486e0c8819452d219d487745aa5ced85c93af