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

Change-Id: I9c5ca9d052ca43b53cfb18e964e4c9aa3c079692