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

Change-Id: I131744ec27478524466d31ac0f507b88de46625e