Merge "Remove CollectionsUtil.java"