Reconcile with honeycomb-LTE-release

Change-Id: I33af94011c738b572ffa3716c9346f078eea843f