am 4c3a589e: (-s ours) Merge change 7137 into donut

Merge commit '4c3a589e8e4efbd6f4c5e63bd94cb6181f189b7d'

* commit '4c3a589e8e4efbd6f4c5e63bd94cb6181f189b7d':
  Remove the Google domains from the Gears permission table when the global location setting is set to false