Merge "Fix memory leak warning."
am: ae6088e456

Change-Id: I3dff126ce299da44030ae92822f48e34e9693a55