Merge "Fix unzip timestamps" am: a5dc3dca66

Change-Id: Ia6991463b70646cbc44c2f8105216c66eb4c4cf5