Reconcile with honeycomb-release

Change-Id: I894d810dbc4d37fe09a2f5e1ae8e9dd7dfbba152