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

Change-Id: Ib38108bc100ce29c765f9f0ef0697212c0109c32