Reconcile with honeycomb-LTE-release

Change-Id: I0665c9e635f6260b3de3590f553c163d6732bb01