Merge "Fix a memory leak" am: cb1b68f9b3
am: 894337ee0b

Change-Id: Ieb9b695cc681831fc3684bcb5d19ddc41099949f