Merge "Add MountService tests and fix a bug it found" into gingerbread