Improve Wi-Fi hand-off am: b9f329f633

Original change: undetermined

Change-Id: I718d815a282684a97427802c2ca1f5632fb5481a