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

Change-Id: Ic78cfb7aac27ecf65ca46d5ea3e6ef677a51d1e7