Improve Wi-Fi hand-off am: b9f329f633

Original change: undetermined

Change-Id: I856a3f9e0e79d15cb9d832b910de2439ff996741