Merge "Add @JvmField annotation to flags" into tm-qpr-dev