Merge "Fix AssumptionViolatedException usage with JUnit3" into mainline-prod