Merge "ADT: Fix version check."