Merge "New APIs for SMSC address"
am: 0a7690ce24

Change-Id: I46c3d46b1e72be5ba2debf59c5fbde3ccbee35f4