Merge "Do not check consistency on eng build."