Reconcile with honeycomb-release

Change-Id: Ibbe91b2c58ef41c449cb4b125b4b6e4034a71ed5