Merge "Avoid @backupGlobals in ExtensionRegistryTest"