Merge changes Icb062ffb,I66c4e8f5,I85247411,Id47c19b7,Ib713c4ae, ... am: 0b32981970 am: e8f922bf04

Change-Id: Id88e2387eedf611e2347605b97b4ec9031eaada8
tree: a0c61a0f6db2a0b55393ef6fbb8f5ac9b1eb88ac
  1. core/
  2. services/
  3. tests/