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

Change-Id: I117510197f3a1f78fb0a2a94941d2a1cd3201d12