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

Change-Id: I053cb53005521cbc4d681b078afed7b46aa1423c