am a82bcf6a: Merge "Remove some old logging code." into honeycomb

* commit 'a82bcf6a55d89017207ac2e47c21166652dca11f':
  Remove some old logging code.