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

Change-Id: Ic0b97fb0689b4d322aa6ed25fe55ec192bff07a5