consistency and grammatical tweaks

Change-Id: I0a1dc9e07f246db3e294f5c62f4ffbd3560b0afd
Merge "consistency and grammatical tweaks"