2b46774f
automerge: 0cb736f * commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1': Guard against MountService throwing NPE.
0cb736f
54f9b1e