Add more plural support for single or multiple features

Change-Id: I9cebe21cf0d6a113c65688355cb929a563c2debd