Merge "Guard against MountService throwing NPE." into lmp-mr1-dev