Merge "Remove MountServiceTests." into rvc-dev