Merge "Fix a crash where user data was not validated."