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

Change-Id: I6208bbf3c55c0def7d8f87347c0983cf640f60c6