Merge "Fix memory-leak warnings from the static analyzer"
am: 2006bfc9ad

Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642