Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: 21dd220d3e

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