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

Change-Id: Ib00d22a850a007049435e856e8326312338b2d3a