Merge "Better fix for bug 3112733" into honeycomb