am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1
automerge: 889a259

* commit '889a259118754af51699e06208feb668af3e6220':
  Fix and be more explicit about plurals best practices.