Merge "Prevent test crashes if device sets invalid curve"