[automerger skipped] Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: ac6f266ef7 am: 7538c0dbdd -s ours
am skip reason: Change-Id I8b8df5096b90ad10545087ab09f68ecae637aa35 with SHA-1 6079c4d8eb is in history

Change-Id: I1fdecfaf7c028ea5999a97298f0649748773001d
tree: 477c532ffbf3e875e4ddfd9ec6695bc7f243456c
  1. core/
  2. services/
  3. tests/