Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521 am: 8c96e87157 am: 015ed4cd36 am: 03c4e00bed am: d2972602ee am: 60a160510c am: cc12f885a8
am: 9c2cbb9a65

Change-Id: I5f690c85201e904b67c33d214a0edcc48eddc555