Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours am: ad9384ee97 -s ours am: 0fac2438a8 -s ours
am: 73d03e3040 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: I5e2ded289222e2b3eebc5f0b0159278e5a085fa9