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

Change-Id: I08047934e1e35c294a24689078db5235c2e596d5