Reconcile with honeycomb-LTE-release

Change-Id: I8a0b1dbf38c17488d6948035158fbd720df062c3