Merge "Fix periodic job scheduling." into qt-dev
am: e2d64ff898

Change-Id: I688363751f06dd6ac1bb6e4107b7fca0a32314f9