Merge changes Ide9daebc,Id47ada57 am: 1609800ef9

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