am 008744ce: am df92635a: Merge "Support zone.tab in bionic, and remove the file format version."

* commit '008744cedaa7e3be533bbedb51dd986c6dfea987':
  Support zone.tab in bionic, and remove the file format version.