Reconcile with honeycomb-LTE-release

Change-Id: Iaceaa1453e9e31e92fd90ff413422792aef940bb