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

Change-Id: Id565f7e9f7e53a09335e468d82d1a04424aabe63