Merge change 2851 into donut

* changes:
  Change comment for SUGGEST_COLUMN_INTENT_EXTRA_DATA to clarify that this column is for use by global search only.