am f0812395: merge from froyo-plus-aosp

Merge commit 'f081239537fd7cfc42b7171973a5aa679213aa54'

* commit 'f081239537fd7cfc42b7171973a5aa679213aa54':
  Disabled verbose logging