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

Change-Id: Ica77dca665ac1b6169049b602abd6ea5102fb12c