Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a am: 6e9867dcc9
am: ce00f641e6

* commit 'ce00f641e6371b41614f171ddaeceffe5b81f825':

Change-Id: Id05d1d52f82fe1cc4d10bccc742a4ce97eb5015e