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

Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
tree: ef5820745b1efcf7c8a279bbd2e346ee329719cd
  1. core/
  2. services/
  3. tests/