Reconcile with honeycomb-release

Change-Id: Ie2453cf52a38c62495ba6e40226a406e40ebdc4a