Merge "Add 'unzip' option"
am: c96563d7f6

Change-Id: Ie4840dbc2073478314c4545fe70edae0c0977047