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

* commit '6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
  Correctly reschedule failed periodic