Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev