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

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