Add missing comma and remove redundant use of and

Change-Id: I859d5e8cddeef1006c57f65dcc69d79fb9878c0c
Closes-Bug: 1342389
Merge "Add missing comma and remove redundant use of and"