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

* commit '2d7320066fd2622241cb388201d8b584081cc19c':
  Fix and be more explicit about plurals best practices.