Merge "Remove MountServiceTests." into rvc-dev am: 2d50b57c am: 33a7ba86 am: 2d086e43 am: e51108ae Change-Id: I111819b863b12de31a1e2641b37e8eed5fd92a16