Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp * commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed': Add MountService tests and fix a bug it found
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp * commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed': Add MountService tests and fix a bug it found