Merge "Handle EAP authentication failure" into honeycomb