Merge "Properly test TrafficController permissions on package updates."