Merge "Remove MountServiceTests." into rvc-dev am: 2d50b57c am: b3b1be10 am: 41a75485 am: 73697cf0 Change-Id: Ibaa85a328ca3845dfed9d6cfc7a2fa82b86267e1