Merge "Correctly reschedule failed periodic" into mnc-dr-dev