Merge "Fix SetupResourceMasks to pass correct parameters"