Merge "Disable functest for xci until xci is ready"