Merge "Bug 2156: Unsupported augment target"