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

Change-Id: I0cb045e807da91b7e1090ce67eda0f55b1cd801b