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

* commit '70facd5836cee17ce4b344bd60a84b1490564c4d':
  Correctly reschedule failed periodic