DO NOT MERGE: Fix to maintain the Carrier Network connection. am: e45b50293e
am: 07998e8e26  -s ours

Change-Id: I5fb03b65175cbfc8992ca72309d5de766bdf3ae9