Merge "Remove static initializer from StreamUtil"