Merge "Convert Flags.java to Flags.kt" into tm-qpr-dev