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

Change-Id: I4701d6691e538dee564b6e87fe0206bd001a0e23