Merge "All zh messages should be falling back to a variant (zh-hans currently)"