am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair

Merge commit '770d5c4f0093a65d20b22f14082911697f9f9b9e' into eclair-mr2-plus-aosp

* commit '770d5c4f0093a65d20b22f14082911697f9f9b9e':
  Futher reduce the logging of EriManager.