Merge "Fix potential leak" into mnc-dev
am: 167af356fd

Change-Id: I47300ca03662a0b24195ac16e73c2873577a2b55