Merge changes I1aabef01,I8dbd0f83

* changes:
  SystemServer: Move MountService startup before NotificationManagerService
  StorageManager: Check for a null MountService