Merge changes Id598ae1d,I475bd011
am: 8fe63a3498

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390
tree: 14e70c48325ad8dd1a40253eba1316da3a1fccfe
  1. core/
  2. services/
  3. tests/