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

Change-Id: I9abbd39c685f8f6faf3dcefe16117e0d07c33b96