Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev