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

Change-Id: Ia00aa35c911f8ce5c5703f1eb3cd6f64f430344b