Fix logic when handling raw data file.

These three fields are all required.
Merge branch 'master' into distributed_services