am f37b258c: Merge change 27146 into eclair

Merge commit 'f37b258c88e339b482696183def08f5c9437a0ff' into eclair-plus-aosp

* commit 'f37b258c88e339b482696183def08f5c9437a0ff':
  Reduce debugging spew and add props to selectivly re-enable it.