Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE