
Remove computeString, computeShortString since their function can be written in one short line and it's hard to name such functionality. Refactor custom plural calculations to use pluralize method. Change-Id: Ia22950b81611dd3b1c8ca0452d2e98b8b84ae2a0