[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours

am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 b645699cdb is in history

Change-Id: I0b5556bcaa27ca0a379f910bfba80aec506348c9
tree: 3b40e8b3a646d451978a1cc5be45d18046edf785
  1. core/
  2. services/
  3. tests/