am f5e18e99: Merge "Cleanup suggest interface"

* commit 'f5e18e992bc10837db4f6cbc0e7c9785677ea7bb':
  Cleanup suggest interface