Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff am: 6deffe3c3b
am: 78a298ce24

Change-Id: If42dc48e4af320026e17365c5263d7629a4eb1b7