Merge "Cleanup DataConnectionTracker" into honeycomb-LTE