am 36b536be: Merge "Reduce log spam." into jb-mr1-dev

* commit '36b536be60b48ba119c85d7c4a1bed41a30fb4b1':
  Reduce log spam.