Merge \"Add support for LTE CarrierAgregation\" into nyc-mr1-dev
am: 37a56b2891

Change-Id: I802ea83a3e1e1328c48ba56142848033c3dc848b