Merge "logwrapper: update benchmark and remove old functions"