Merge "Fix wifi flow" into honeycomb