[automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58 am: 14ea3431d0 am: f24de20769 -s ours
am skip reason: Change-Id I7065d081c11bc606d691f76ac8b499dd075d6504 with SHA-1 de933af7a7 is in history

Change-Id: Ifa5a0b23acc51bc01d480046a4354376083ff84a
tree: 9af097077335c757745b12fcd191473f512b2cb8
  1. core/
  2. services/
  3. tests/