Migrate google changes as described in #77