Merge "Fix unit tests for people service." into rvc-dev