Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD

Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
tree: a95a506a99d1e6843857d2eb4212a140eb74e83e
  1. core/
  2. services/