Merge "Create tool to auto-generate vns_policy.xml" into nyc-car-dev