Merge "Limit the number of routes for performance" into pi-dev
am: 3957f6dc0d

Change-Id: Ida402ad8f864400561bba0e07cfd5fe766ee08bd
tree: 1ca633c6b1b1803de818717916267b418774baa9
  1. core/
  2. services/
  3. tests/