Merge "Cleanup/add log statements." into honeycomb-LTE