Merge "Enable validation of project id in quotas"