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

* commit 'f23e617bcd8090ef96a5449907c4db39f7efb6a5':
  Correctly reschedule failed periodic