Merge "Carrier Wifi: changing the uri being sent when a certificate is downloaded." into pi-dev am: c8794aa06a
am: de33c3c002

Change-Id: I9587e3103b9d16395034f41f428f96f4bc0c40f6