Merge "Fix memory leak"
am: 0e3c7c5ac8

Change-Id: Ifb51db9039c19abd09cf8e1ab59538240901ad8b