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

Change-Id: I888db7ef5fdcf5b80d7317ff806c24506d31c72e