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

* commit 'b0675df8fd377230edc392e02ba0eba275b57992':
  Idle maintenance scheduling broken.