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

Change-Id: I823d8c25c51e98b05cdb53349e34dc135ea4bde2