Merge "fix potential leak of memory pointed."
am: d1506c64ad

Change-Id: I1ff731e498540f4927355154069e9a6a997bc926