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

Change-Id: I4b997550a6307cd13d79a4627b0725b22b65b0e6