am ea8ff822: Merge "Fix and be more explicit about plurals best practices."

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