am a553773d: Improve backward compatibility of plurals formatting.

* commit 'a553773d208f874df5f94a79eec1e3a9d3fa3407':
  Improve backward compatibility of plurals formatting.