[Bug 24439] - Categories are not saved when doing upload of files

Change-Id: I7a0ff2e57735e4fcf69bd7ceee0772276d41ef9f