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