Merge "Use callerPackage instead of callerApp." into nyc-dev