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

Change-Id: I9cbf69f1fa4a7a1f916a1246bdea1361523a4d1b