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

Change-Id: I8003681eb772d66d7c32a5d0b13391ff05c77f47