Merge "Split internal common utils library to 1.x and 2.x."