Merge "Fixed incorrect data network type when device is on IWLAN"