am c17f16e3: Merge change 2851 into donut

Merge commit 'c17f16e33a0fca7efa10e758a526cd8d5d3a31f3'

* commit 'c17f16e33a0fca7efa10e758a526cd8d5d3a31f3':
  Change comment for SUGGEST_COLUMN_INTENT_EXTRA_DATA to clarify that