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

Change-Id: I07d4e3193af523ef98d93716d0ec9419b138792a