with Downstream project. Also fixed a couple of things in upstream_spi.c and upstream_interface_msc.c but due to file rename the diff is not obvious...