Merge change I5ec249ab into eclair-mr2

* changes:
  More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).