Merge "Fix a memory leak."
am: 1715678a89

Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672