Merge "Fix potential memory leak."
am: 89bdf3ae71

Change-Id: If83e8a7631f7cbb37b0f1724b94957a9dab347ca