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

Change-Id: Ib796d3769ccf7ca0ed2c58d866f9a9e92a527ee0