Merge "Fix NumberFormatException in SipEditor when saving port number" am: 3a7d7b242e am: 67bd4d13ba am: 08631a0722
am: 0f83cca1cd

Change-Id: I228d22200482658c41efec02282adf9ead898585