Merge "Merge "Remove MountServiceTests." into rvc-dev am: 2d50b57c am: 33a7ba86 am: 2d086e43 am: e51108ae" into rvc-qpr-dev-plus-aosp