Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21' * commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21': Fix issue #2136448: googleapps crashes while adding 2nd gmail account
Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21' * commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21': Fix issue #2136448: googleapps crashes while adding 2nd gmail account