Reconcile with honeycomb-release

Change-Id: I4ff73170b09410bf6458539f72caa60fcc99a442