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

Change-Id: Ic083bb9487da697c439defdc33dec12b12bdcaca