ONC: Fix Static-/Saved-/IPConfig.

chromeos/network/onc/onc_translator_shill_to_onc.cc

Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 3abb44375c531743470b227a757659f8c48be251..4ac1af40715065d39746233203e02aaf45c58a9e 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -466,6 +466,12 @@ void ShillToONCTranslator::TranslateSavedOrStaticIPConfig(
     onc_object_->SetWithoutPathExpansion(::onc::ipconfig::kNameServers,
                                          onc_nameservers.release());
   }
+  // Static and Saved IPConfig in Shill are always of type IPv4. Set this type
+  // in ONC, but not if the object would be empty except the type.
+  if (!onc_object_->empty()) {
+    onc_object_->SetStringWithoutPathExpansion(::onc::ipconfig::kType,
+                                               ::onc::ipconfig::kIPv4);
+  }
 }
 
 void ShillToONCTranslator::TranslateSavedIPConfig() {