Merge "Silence a memory leak warning from the static analyzer" am: f44ebf5fcb
am: 20674ac1eb

Change-Id: I0f0efff718ae96adcc30ef6554aaccc96da66b0a