Merge "Fix matrix dep on kernel configs"