Bug 18144: Restore pieces of C4/Auth to make Google OpenID Connect work