Reconcile with honeycomb-LTE-release

Change-Id: I4505a64656a03777b964d267b6b0c767f601d8cd