Merge "Handle handover to wifi failure." into nyc-mr1-dev am: 4832a0747d
am: 05a2110cbe

Change-Id: I9ef5ba23435fcf8933de800302d773d79ff71f46