Merge "Revert the deprecated comments for splitName attributes"