Merge "Remove duplicated code to push firewall UID rules." into nyc-dev