Merge "Fix static analysis warnings of memory leaks."
am: f001740a65

Change-Id: Ice60379bf202c67f874c819134a22229a26ac410