Reconcile with honeycomb-LTE-release

Change-Id: I98bfcba4046382292383ce333ab521b1ab583ce1