Reconcile with honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I865fe646706016836a842a75057bc79b3989ac89