Merge changes I10c01f2b,Ie05bc535
am: c182d29130

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
tree: e38d2ee01837bb314366cc5db022fd3a89b60d67
  1. core/
  2. services/
  3. tests/