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