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

Change-Id: I5a00222448104a138977fc1391c72cba95c22834