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