Merge "Convert Flags.java to Flags.kt"