Merge "Fix possible NPE when matching accessory version"