Merge "Do not set incorrect SMSC address"