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

Change-Id: I712e6e42cc754db2513321b3498018b21b94161e
tree: b64fe7ebcb9f5975af1d0e629063f4ac2bdcf89a
  1. core/
  2. services/
  3. tests/