Merge "Fix strict mode violation in GoogleAccountLogin"