Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
am: d04d64c133

Change-Id: Iea1cf18398f137736b9f50494429e54eb18569d8