am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"

* commit '487d6d3db3f504b0120fc605ad3a4155ca214674':
  Fixed warnings test_zipfile