Merge changes from topic "am-4d01586376f049448a8135ed5eb2c26e" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Handle invalid data during job loading." into tm-dev am: f8449a01 -s ours am: d8df42f9 -s ours am: a0ec0b27 -s ours
  [automerger skipped] Handle invalid data during job loading. am: 8c8d1c0d -s ours am: ee816a25 -s ours am: 6cefcb24 -s ours