Merge "Add debug for tracking bug 3404006." into honeycomb