Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am: 6c0106b57f

Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
tree: cb913722b380d983785470f7c2ea3154046daf9e
  1. core/
  2. services/
  3. tests/