Merge "fastboot: Workaround for touchbar hang on MBP 2016" am: fc267f865e
am: 0474cfba64

Change-Id: I80852fa9017a7d57de42f241e0df134390b1c0f6