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

Change-Id: Ifa43447bddd0ebe7e35a1a2a7ee9a5072d20b57b