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

Change-Id: I3c5647e167bdfaa1b191b101e598c695151fa46d