Merge change 21855 into eclair-dev

* changes:
  Removing reference to MAX_SUGGESTIONS