Merge "Limit the number of routes for performance"
am: b8a1509d68

Change-Id: If4de2779b24560f75a7bb977dbb0f996115a0648