[automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: ca6e20c5d2 am: 196e334a59 am: b65ee4bbc1 -s ours
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 c19c94fe9b is in history

Change-Id: I306a831e47c08ac37de93285763500b73a4624ec
tree: d8573f0c9dadc135078b0151a1b26e4c9e28ad77
  1. core/
  2. services/
  3. tests/