Sync lang-specific extras and collections with legacy unified versions.

Change-Id: I2c92ec19e8c502de73c6caae14f54ba627f3d564
1 file changed