Add plural support to comment

Change-Id: I8070d01d8c6a004573cfe8beeed38feb9d5cc371
Merge "Add plural support to comment"