fix redundant use of the term and

Change-Id: I3727912f1c1bb7e58fb3e7030a86c66952be05e4
Closes-Bug: 1342374
Merge "fix redundant use of the term and"