Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70

Change-Id: Ie0c5a3c7bfc16edf98203212b8a1e7e4e8b302b9
tree: 65013168bc3d348cd67d8123a5686b2166ba6f36
  1. core/
  2. services/
  3. tests/