Merge "Scan all descriptors when checking for fastboot"