Merge changes If28f0be6,If0f80067
am: 96529ad7fc

Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
tree: 1819075bd2bf38f5bb417725a579569237fbc499
  1. core/
  2. services/
  3. tests/