Merge "Minor fixes to fastboot_driver" am: 8cf510ff81
am: 794fb0107b

Change-Id: I555dc0402d5db1dc0b5fbf7cc2ff1c4cb1864994