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

Change-Id: I2cc7c861011387e70557fdf110470db7a125bcd2