Merge "Fix a memory leak" am: a7dbdc8553 am: d8ce8e33e9 am: 584d6870c1
am: 6bb53c045a

Change-Id: I63f065aac01e743eb3a700d7b35b94312694b1e7