Accept any number as explicit plural form

Change-Id: I87563386cdffc1d47e3ac430accc5511d2b40ae8
Merge "Accept any number as explicit plural form"