Merge "Allow uninstantiated BootloaderStateTest"