Merge \"Stop listening for WiFi interface status changes\" into nyc-mr1-dev
am: 377a8dd1e4

Change-Id: I3a3d1b254a5f2596a050977318645eb4f47c1534