Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 055202128f am: f21eb55362

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