Merge "Allow us back on the network after carrier-detatch" into mnc-dev
Robert Greenwalt [Mon, 24 Aug 2015 21:28:50 +0000 (21:28 +0000)]

Trivial merge