Clean up route id; new schedules for v1.7.

Change-Id: I2785ffa29fb934d8850dc9bb10966fb6f3bb67fb