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

Change-Id: Ie4741f517a464ddb02cf6f1ccccc131cf3eafcfa