Merge "xci: Enable yardstick"