Merge "No-op flag to keep tests working in this branch."