Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef

Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
tree: cd0b1ff7c1219aca28af88e07802f99d7c0446cf
  1. core/
  2. services/
  3. tests/