Merge "Update constellation types in measurement corrections"