Merge "Check calling package against uid"