Merge "Fix an issue where running multiple test cases would cause a NPE in CarStorageMonitoringService"