Reconcile with honeycomb-LTE-release

Change-Id: I2e9258d81a5a89d8d07af36c70c3bb2463bde3b4