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

Change-Id: I8466a554dbe03eb83f8f737ff76b159dde0fc532