Merge "Minor fixes to fastboot_driver"