Fix some de-normalization of plural forms or grammar Change-Id: I9e2b5ab7a2744cd730a95e9f53c0ebc5fb696ad9