Merge "Fix static-analyzer memory leak warnings."
am: ba27872adb

Change-Id: I6c5bae9ad45b543ee2de35b7089fb4f40da888fb