am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev

* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.