Merge "Make string not translateable." into jb-ub-mail-ur11