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

Change-Id: I643496a48a4a1fedd4fe9ddd7150f670ac4b14f2