Merge changes I0baf582f,I4bba01ba
am: 6d7c97dc5c

Change-Id: Ie69a03e6c61e172ba7e9948706fe6780be61a41b
tree: e24f86e128b714cea0147cb2b73678c986a9aec7
  1. core/
  2. services/
  3. tests/