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

Change-Id: I91bac4dac516d6a404889bdbff837efc09873dca