am 34e32466: am 8511b3ae: Merge "Remove -z option."

* commit '34e32466466ad3f46697798c9f9644d62390c9b5':
  Remove -z option.