Merge "Decrease stiffness for one test to reduce flakes."