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

Change-Id: Ib7722cdeaaa8252024c3ffc7aca2cfc564eb106f