Reconcile with honeycomb-LTE-release

Change-Id: I34aedca62dce89222c1923e53c0082a3dcc65ec3