Merge "Remove reference to deleted gzip module" am: 48d610ab18 am: 55665c3c97
am: 2a0f067126

Change-Id: I37fe0fab5d3afc163296116a3f5df4b6e8c59e58