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

Change-Id: I80adc93fc89e3722f6b14f3ef7d3ee82edcefeff