Merge "Fixes honeycomb"