Merge change 20866 into donut

* changes:
  Make the res qualifiers aware of the project target to handle differnt behavior.