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

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.