Reconcile with honeycomb-LTE-release

Change-Id: Idb89a4b2df79b329f862b07f214a008a480c1bab