Merge "Fix NPE in StorageManagerService."