Merge "Use user policy for compatibility tests."