Merge "fix a memory leak." am: a24fcc412f am: da95482f52
am: e936ee515c

Change-Id: Ida656cd9c9a9e1d3156e6570d3160218a6eb6b79