am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev

* commit '9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
  Fix parole scheduling bugs.