Merge "Remove "es" from dropbox_system_server_crash since it's an optional field."