am c699b871: Merge "Fixed a bug with HUNS and dreams" into mnc-dev

* commit 'c699b8713080e73be7e479530ea38bf06d0882bb':
  Fixed a bug with HUNS and dreams