Merge "Remove bootloadertest's contents" into main