am 84864297: Merge "Improve backward compatibility of plurals formatting."

* commit '848642974cdd2606f21a596a2c7224ed4f0a70db':
  Improve backward compatibility of plurals formatting.