Merge "Fixed augment schema path resolving."