Merge "Add aggregate routes and VNR rebuild to GR Yang"