Merge "Modify baremetal_basic_ops test"