Merge "Decoupling yardstick_verify.sh"