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

Change-Id: I92f65b5720aed2ffe0659c19d54836e8c87f94fe