Merge "Benchmark: Avoid potential memory leak" am: fb4a455323 am: 916c6b14eb

Change-Id: Ie587ea923d0fc69889061584e3a6aebde369a199