Merge "Bug 2538: Remove redundant Augmentation checks and tests"