Reconcile with honeycomb-LTE-release

Change-Id: I5bac70e5d4432c54ced5a85f629eb819f1d70f2e