Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am:...

Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb5125 -s ours am: ad9384ee -s ours am: 0fac2438 -s ours am: 73d03e30 -s ours
am: 1668ed9a -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05 is in history

Change-Id: I9109e300ab64d84498f1da9ab245280cb0814a75