Merge "Fix flipped CLIR message."