Merge "Remove duplicate impl of CollectionUtils.emptyIfNull"