Merge "Fix a memory leak reported by Valgrind" am: 160a7c4181 am: 37c2721ebe am: ae8f6faba4
am: afa477cf9a

Change-Id: Ib24c96cf3cff9679ae3066bb50131dac481422c1