Merge "Remove MountServiceTests." into rvc-dev am: 2d50b57c am: 33a7ba86 am: 4bc965e6 am: bae006c5 Change-Id: I62c8754c290f6a7165d881597c1b0ee305c94e44