Reconcile with honeycomb-LTE-release

Change-Id: I23ee9d5a76c931031ca51bc9b93938cd48c39498