Merge changes Ia43f8811,I7de4f672

* changes:
  Remove providesRoutesToMostDestinations.
  Cherry-pick the relevant parts of master change I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict