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

Change-Id: I7d05444ab01fef127a7186fd6abf53eba53b5078