Merge "Silence static analyzer warnings about memory leaks"
am: 20ae530e01

Change-Id: I3501573fbf2767570b5d9a615a5f53637b9771fd