Merge changes from topic "fix_master_build"

* changes:
  Revert "Cherry-pick the relevant parts of master change"
  Revert "Remove providesRoutesToMostDestinations."