merge from open-source master

Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
tree: df7936dd80587f55f84930a59412633f08bb0e66
  1. core/
  2. services/