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

Change-Id: I1f1571906ad7782ed84f5aea4d0bad67764c210b