am bbcd0a75: Merge "Fix heap trimmer daemon sleeping." into lmp-dev

* commit 'bbcd0a75324dd9554109d91f2e9f7ae5d4c4a28a':
  Fix heap trimmer daemon sleeping.