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

Change-Id: I5083a878e7758463809c0fc044391e75077ae94c