Merge "Support zone.tab in bionic, and remove the file format version."