Reconcile with jb-release

Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9
tree: 28e7e4490837700ecd43c9c3545135be0d6bb64d
  1. core/
  2. services/