Reconcile with honeycomb-LTE-release

Change-Id: I420737faef935997dfb149805ab7f9ba45a3d9db