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

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