Reconcile with honeycomb-LTE-release

Change-Id: I3ce89e9dd1e8e5af604c6011372d03871788d68d