Merge "new search results layout. no more custom suggestions; just API matches...
Merge "new search results layout. no more custom suggestions; just API matches and organic results. am: 38b0e220 am: 4f9a67db am: 0b4b80b7 am: ebb074ec am: 304b99dc" into nyc-mr1-dev-plus-aosp