Merge "Pass in external packageName"