OCD grammar fixes

Change-Id: I557e0e6a3dd87792cf6c22040e7bd06fd5ff0dd6