Trim down the logging class am: 3650019856
am: 5f03934774

* commit '5f039347747bd8435fd8e7d1ae71f6f917916b3e':
  Trim down the logging class