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

Change-Id: If1c755b190e6096059701eb9b1de7b5cf2bc8b57