Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f

Change-Id: I04d08ae82530481d6ea49120107772d37fdc1627
tree: 28870b27909684613fe74bd6387875e43125e75c
  1. core/
  2. services/
  3. tests/