Merge "Don't use `unzip -t` when `unzip -l` will do." am: a803d77648 am: c26bc5cc4f am: 54f911f8b2

Change-Id: I54dbd4cc5b509e61fbbc6b443dfc1f907ef67097