Merge "Clean up some debug statements." into honeycomb-LTE