Merge "Silence static analyzer warnings about memory leaks"