Merge "Fix b/10457328 by making "many" string a plural." into jb-ub-mail-ur10