am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev

* commit '40ec3a924663c831e47f5e851b2978b96ff428fb':
  Correctly reschedule failed periodic