Merge change 8209 into donut

* changes:
  Work around StateListDrawable padding in search suggestions