Merge "Extract zip file in tmp directory" am: d8055f8cee am: ef201acc0a

Change-Id: Ia03eca48b999e3c429f348c319f9b18262791dfe