Merge "Change package for FMQ benchmarks"