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

Change-Id: Ief15a79e0722aa2efada5742a65f4f3c4f6227e6