Merge "use correct URL to notify sms provider changes" am: 0dec095101
am: 8f1a4b5d88

Change-Id: I575eb9fdc15251abae7bd3af1ff1d1f67308cd18