Merge "Fix check for required features" into honeycomb