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

Change-Id: Ice30391dfa5352ca12eff79ca888febe87aa63ae