Merge "Mark UI tests as flaky and restore role tests for presubmit."