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

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