Merge "Fix description of indices for messages in the ICC."