Merge "Ensure all Java-side usages of config flags are using Java flags" into nyc-dev