Reconcile with honeycomb-LTE-release

Change-Id: I1d877334c673a600d5f31abe8c2764635dcd98f2