Merge "Add yardstick danube3.1 support."