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

Change-Id: I4dfe041bcfa9d9c9ee7171796e92f6a2665c1636