Merge "Add support for LTE CarrierAgregation" into nyc-mr1-dev