Merge "Fix or disable broken/flaky tests on physical devices"