Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1