Merge "Convert native changing config flags to Java flags"