Reconcile with honeycomb-release

Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60