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

Change-Id: I3f0195ca66bce487e0aea38b02d3fb00c7a6eff6