Merge "Adds qssi custom OTA merge config files"