Reconcile with honeycomb-LTE-release

Change-Id: I1a6bb45628a827967aafe7cecc323439d2ea39a4