[automerger skipped] Merge "Correctly support LTE carrier aggregation" am:...
[automerger skipped] Merge "Correctly support LTE carrier aggregation" am: 5f432748 am: 9b4e089a
am: 94e03077 -s ours
am skip reason: change_id I92b37c17c92b127c7d3729b266be3989b2f2e810 with SHA1 6c9777b2 is in history
Change-Id: If7d60ee2c83ada3895a5490f5ad6b894c9cd39d6