am 95fe8267: Move suggest logic to AOSP

* commit '95fe8267955ba5bfcc3cf38383f0d13026287082':
  Move suggest logic to AOSP