Fix memory leak

Change-Id: I30ab0dcf47d236c8ebda3a2d1da0aaa4f0cd7477
Fix memory leak

Change-Id: I64a74ea23d9a2410ebff0c42c54601fd0b0190f0