Merge "Properly test TrafficController permissions on package updates." am: 0e45bfabfe
am: e21f0cf185

Change-Id: I9be962d0d9fcf4697ef2998055247186b466470a