CDB-1788 Google revoked grants throw different error, make sure it is always removed from our system
Merge CDB-1788 into release/2.13.1