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

Change-Id: I868e666cf85ec7d71115fb431ff4a42f5d7861d7