Merge "Add uid to the failure log of testFirewallBlocking"