[automerger skipped] Merge changes I6260695b,I88f00ca4 am: db9335b832 am: d7a0be5096 am: 007afa6763 -s ours
am skip reason: Change-Id I0a462da4e87cae2c7d4a9b9a92de061a086c5752 with SHA-1 b3d429fda1 is in history

Change-Id: I9486a6519b3ff53ed834ef6367ed62911b2e6bef
tree: ae977bcd1634b9cd2bb7ae7c47c7f1303454e75a
  1. core/
  2. services/
  3. tests/