Reconcile with honeycomb-release

Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
tree: 69d8657aea8be67a1d2919664da2875b2c39393a
  1. core/
  2. services/