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

Change-Id: Ib95cb5042265ffc401d29469c3a85f4222973198