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

Change-Id: I19e8770cf35d254e815bf9ed3e9ef4053657de2f