Merge "fix warning: Potential leak of memory pointed to by 'bench'" am: 43b28bc67b am: b03e1977e6 am: db0b38fb19
am: a576f9935c

Change-Id: I927172326f5611c81a6749a10664c49ab3b3821a