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

Change-Id: I0a2d64e9afd3066fb117a884b03e818c5a07a9c7