Reconcile with honeycomb-LTE-release

Change-Id: Ic703daad3bb40d8fa03c961d97e80167aa1278a8