Add commas for ease of maintenance

Add commas to lists to make adding to the lists easier. This is
correcting some nits from earlier changesets.

Change-Id: I3ab3f230917e4f2156ba667e870dd92fd55c896e
Merge "Add commas for ease of maintenance"