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

Change-Id: I53c7871217b9d6b071ea4e8c5db91a5bb14ae034