Merge "Don't require bootloader fastboot for VTS compliance." am: ac892d7569 am: 83eda512e6 am: 881bf89454

Change-Id: I915ac4b54706615ecab5dc48452b74d09e49befd