Merge "Add 'unzip' option" am: c96563d7f6
am: e15673e0cc

Change-Id: I3f8dc10f62b0bb7383bfa8c5b167f25f8a35dae8