Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521
am: 8c96e87157

Change-Id: I8e207b2ee20bbeacd4a91439ac098304d6ca6748