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

Change-Id: I00c7c8cccde07326cb517633e0c4a9286035292e