Merge changes I98573a5c,Ic7394f24 am: ca3c2504b5
am: d4b112fee1

Change-Id: I279765199a80b0639dde31302778a95c0f9fd705
tree: 3fd62a1fa4e7f590d6b0036741d215ae64658351
  1. core/
  2. services/
  3. tests/