Merge change 1275 into donut

* changes:
  Make the internal storage monitor work correctly when internal storage is very large.