Merge "Improve error message for missing content model on import"