Merge change 27178 into eclair

* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account