[automerger skipped] Merge "DO NOT MERGE Remove old suggestion code."
am: d720f7d670  -s ours

Change-Id: If851fe5c0e36df708919e8efba614a661bb6722f