Merge "fix memory leak in unittest." am: d9ea298022 am: 607a669016
am: 7479ae94e0

Change-Id: I46602c43fe55c92fd109fd325648d1cb6ca6ba49