Merge "Fix getCallingPackage() to handle reentrance." into klp-dev