Merge "wifi(implementation): Callback death handler" am: 10b0e0880c
am: 00176aff3d

Change-Id: I9bc0ed731b2e87c54105371da422c6f0a669bc28