Merge "Don't require bootloader fastboot for VTS compliance."