Merge "Silence static analyzer warnings about memory leaks" am: 20ae530e01 am: 07406662a4 am: 64b6ce0d75
am: fd60591eb1

Change-Id: Ie81cd1ae224e33b4c2a1e09b567cc6ba99c98643