Move google login related stuff into lib
Merge branch 'master' into builds
7.862