Merge "Fix isAtLeastU for post-U codenames"