am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread

Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found