Merge "Set span boundary at word boundary in perf test" into pi-dev