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

* commit '6e9867dcc9766d3f14627b34ee4b74531062681a':

Change-Id: Ifa40dcf509d5a70d2058d0255dfc21a8945cffe5