[automerger skipped] Merge "Fix job persistence & re-inflation"
am:83bb512502-s ours am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA17f6acc05dbis in history Change-Id: Iee32d7f21321441ff96d096c685bd120a9133f44
This commit is contained in: