Merge "Api review: change updateFirewallRule to setUidFirewallRule" into tm-dev