Merge "Handle handover to wifi failure." into nyc-mr1-dev