Reconcile with jb-release

Change-Id: I68d329b7abda2aedfd3fd98419f3b3167ccfbc2a
tree: 6ed554a5899131a95d7a34ecd5e335e6f13593de
  1. core/
  2. services/