Merge "Fixed memory leak with the inflater" into oc-dev
am: 3d5fd7a959

Change-Id: I90d93918d1b188d09f6d2cf3ed70ceed38b07086