Merge "Limit the number of routes for performance" am: 7f5163f453
am: 554f03dc04

Change-Id: I1fcf34b553b4a7cbadd0a2a7bf697140e948243e
tree: dcf1a4fa0f29518deac96a095cc135b9c11b8821
  1. core/
  2. services/
  3. tests/