Merge "Fix upload/download of attendee status" into froyo