am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair

Merge commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3' into eclair-mr2-plus-aosp

* commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3':
  Reduce the amount of EriManager Logging.