CLC-955 Make Google token refreshing work