Merge "Fix log spam in unzip-jar-files" am: 05ecd66557
am: 17f23f3837

Change-Id: Id49b99ce742c23fb49db0231b3212a7a50c69756