Merge changes Id8776d14,Ifa291c62,I5ea9d200
am: 76715955e0

Change-Id: I7a0b01cba8bdee67cffabddacb4ff5f4591cbc34
tree: 32f944079e797aa9b3819297019f4771d771eb31
  1. core/
  2. services/
  3. tests/