Merge "Fix "use of memory after freed" warning."
am: 3f5160cadc

Change-Id: I3b431990684662b4a504b35ff72c673e53fa7e03