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

Change-Id: I6cc8b3e3e610e12e0df592b615556c5b8b1e45ea