Merge "Tentative fix for issue 3362362." into honeycomb