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

Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d