Merge "Use Root numerals for all string logs" into tm-mainline-prod