[CLC-1736] Another  on the has_google_access_token
Merge pull request #1004 from yuhunglin/CLC-1736

[CLC-1736] Another  on the has_google_access_token