Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev