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

Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4