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

Change-Id: I41255d6566f00e57c3328d2250ff491b25e0536f