Merge "Use resolved augmentation schema instead of original schema."