Added plural support for a message

Change-Id: Ic23eb4d61ee9716ce40030c8bb52f136d9505dd4