Merge "Check if mWifi is null inside of registerHalCallback." into udc-dev