Merge "remove unused combineUidTag()"