Fix some stuttering in comments and documentation

Change-Id: I9c0088b9aab37335203cad45a1d6fa8ac3f43321
Merge "Fix some stuttering in comments and documentation"