Fix memory leak

Change-Id: Idc75fd0735452ffdf6a21e3597cd3fe74f651581
Fix memory leak

Change-Id: Ib0a2d8d69f5bd43872c949d79c685f71657dc9db