am b5a31634: Work on issue #2163789: Way too much logging

Merge commit 'b5a3163481794babda78716e576e35818de0cc03' into eclair-plus-aosp

* commit 'b5a3163481794babda78716e576e35818de0cc03':
  Work on issue #2163789: Way too much logging