Merge "Apply default policy for enabled rules without custom policy" into udc-qpr-dev