Merge "Correctly reschedule failed periodic"