Merge "change m1.* flavor to "yardstick-flavor""