Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d

Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
tree: 4f22242feb646503ba0a8912e879ff45b850e962
  1. core/
  2. services/
  3. tests/