Merge "Fix static-analyzer memory leak warnings." am: ba27872adb am: 283c74c540 am: c458028f69
am: 83ca015933

Change-Id: I5d09e7951892a0c0b3ff81d19f1c6167402db226