Start building suggest field combined didyoumean

Change-Id: I860e7c7ba682111f94eecbe907a937f9618c8465
Avoid infinite fallback loops

Follow-up to I144dacaf36

Change-Id: I72868fb866c53388bb839990b0bb303358410126