Merge changes Ide9daebc,Id47ada57 am: 1609800ef9 am: 0cf192258c am: c95de7b476

Change-Id: Iaacfbe8b221d79e3d06d0d7ea81528db13e4611a
tree: 5526e9951121ffa0da847d9cabddbbac01da514e
  1. core/
  2. services/
  3. tests/