am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev

* commit 'faa47b526fc35be01b1bc46a78679adde87f6701':
  Idle maintenance scheduling broken.