Merge "Added m5 strings that need translating." into tm-mainline-prod