Merge "Fix memory leak warning." am: ae6088e456
am: 37cd5f116d

Change-Id: Ie4fb09cdd3fec819eb67563e251b927d4202de07