Fix memory leaks Bug: 64424279 Change-Id: I814f81d8e050132be7779310d3f1ab6b19f2e593 (cherry picked from commit 12586d1c216c52efbfd2265d240147b1c31fe543)