am d1c2a433: Merge change 5160 into donut

Merge commit 'd1c2a433c79451aac4340aef8f0d83081977df84'

* commit 'd1c2a433c79451aac4340aef8f0d83081977df84':
  Return the url of a browser history item in the intent query column of the