Improve Wi-Fi hand-off am: b9f329f633 am: 373a9e426c

Original change: undetermined

Change-Id: I4d985bc1ef94b8b4ccf685068fe879b2add0a471