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

Change-Id: Ie808d58e2693d9b5e14474b442b469e1b522d9a0