Merge changes from topic "am-28cf2925f74a426ea035b6c9430105c9"

* changes:
  [automerger skipped] Merge changes from topic "am-4d01586376f049448a8135ed5eb2c26e" into tm-qpr-dev-plus-aosp am: 0db3bf8e -s ours am: dab34aeb -s ours am: 64b2a23b -s ours
  [automerger skipped] Merge "Handle invalid data during job loading." into tm-dev am: f8449a01 -s ours am: d8df42f9 -s ours am: a0ec0b27 -s ours am: 7cd87d72 -s ours am: 035b81ac -s ours am: 7d121003 -s ours