Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp * commit 'f5201ab71ff4d104265ab126e86afc6b81da8011': Keep original phone number in SipConnection.
Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp * commit 'f5201ab71ff4d104265ab126e86afc6b81da8011': Keep original phone number in SipConnection.