Merge "Remove MountServiceTests." into rvc-dev am: 2d50b57ced

Change-Id: I83f2296aec9fff4a2d661f2b371ffdc43113f0e6