Merge "Fix persisted job handling in bad-boot-RTC situations" into pi-dev
am: edf20ebe48

Change-Id: I7407690c3fed0dddf5d03eb1ddc306256722fd1b