Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
tree: a6e2214000b558675ed76b3895a287bcedff5ec9
  1. core/
  2. services/