Merge "Correctly support LTE carrier aggregation"