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

Change-Id: I75e923a774f35e8cf8a6f48c2437b5862e68c1e2