Merge "fix a memory leak."
am: a24fcc412f

Change-Id: I419a6ed67f579f59658b87ce250585cb7b791d9d