am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices.

* commit '03c80408d2651bcfaa707233cd0b54b7a8ca57ad':
  Fix and be more explicit about plurals best practices.