Merge changes Icb062ffb,I66c4e8f5,I85247411,Id47c19b7,Ib713c4ae, ... am: 0b32981970 am: b4a492f581 am: 59c5f07871

Change-Id: I213d2cdca4187ed30293dc433cfee9e8af782b6e
tree: c62c49ca8976f9fb791fda507b064d82487dd368
  1. core/
  2. services/
  3. tests/