--- commerce_extra_address_populate.module.orig	2013-08-24 15:48:38.000000000 -0400
+++ commerce_extra_address_populate.module	2013-08-24 15:47:02.000000000 -0400
@@ -81,6 +81,33 @@
             }
           }
         }
+
+        // Address Field Phone support.
+        if (module_exists('addressfield_phone') && !empty($form['commerce_customer_address'][$langcode][0]['#address']['data'])) {
+
+          $phone_elements = drupal_map_assoc(array(
+            'phone_number',
+            'phone_number_extension',
+            'mobile_number',
+            'fax_number',
+          ));
+
+          // Unserialize data, else skip if string
+          if (($data = unserialize($form['commerce_customer_address'][$langcode][0]['#address']['data'])) && is_array($data)) {
+            // Store unserialized data values in additional fields
+            $phone_data = array_intersect_key($data, $phone_elements);
+
+            foreach (array_keys($phone_elements) as $ap_key) {
+              if (strpos($ap_key, 'phone_number') !== false) {
+                $form['commerce_customer_address'][$langcode][0]['phone_block']['phone_number'][$ap_key]['#default_value'] = $phone_data[$ap_key];
+              }
+              else {
+                $form['commerce_customer_address'][$langcode][0]['phone_block'][$ap_key]['#default_value'] = $phone_data[$ap_key];
+              }
+            }
+          }
+        }
+
       }
 
     }
