Merge "Import GL registry from upstream @r26448."