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

* commit 'fe9c950a49a9bcdb9e35f709a7d1fffad58aa414':
  Fix parole scheduling bugs.