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

Change-Id: I5c900b5bc9d6add6d886a35e27e84355cd124254