Merge "Remove some old logging code." into honeycomb