Merge "exclude flaky tests for 9.0 R2" into pi-dev