Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a
am: 08c8da2893

Change-Id: I45158becd88d1e38f492a3ad5023aa96fae5ccd3
tree: 97c7ef4eb249aeea3d154520f8e5e9a8a6107a2b
  1. core/
  2. services/
  3. tests/