Merge "Remove '-f' from unzip command"
am: 267eb6a5ca

Change-Id: Ia2d5563b5487ad9d5300eb13735d613445ec3fb9