Merge "Ensure all Java-side usages of config flags are using Java flags" into...
Merge "Ensure all Java-side usages of config flags are using Java flags" into nyc-dev am: 781fbf28
am: 8761e95f
* commit '8761e95f':
Ensure all Java-side usages of config flags are using Java flags