Merge "Promote stable flicker presubmit tests"