Merge change 21186

* changes:
  Trigger data connection update if network type changes.