am 0b1a255f: Merge change 8228 into donut

Merge commit '0b1a255f736851342016e657ba6ccf096a9497ea'

* commit '0b1a255f736851342016e657ba6ccf096a9497ea':
  Remove background padding workaround from SuggestionsAdapter