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

Change-Id: I4dbfad16a2626c39f349a3be406ea75d2e845b9e