Merge "Fix null safety - ResourceResolutionDBService.write"