Merge "Fix null pointer WifiInfo" into udc-dev