Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev