Merge "[automerger skipped] Merge "Handle invalid data during job loading."...

Merge "[automerger skipped] Merge "Handle invalid data during job loading." into sc-dev am: 1a150853 am: 37996032 -s ours am: 5bf9e094 -s ours am: cc268c88 -s ours am: 3fae00fa -s ours am: 8d89d636 -s ours am: be610ee4 -s ours am: 9451ff05 -s ours am: b0b1b08c -s ours"