Merge "Make onPackage[Added|Removed] as non-public methods"