Fixup Google API OkHttp integration