am 4d7f6230: Merge "minor CloseGuard javadoc corrections"

* commit '4d7f623096baf10fce592995cd959f28e56f4593':
  minor CloseGuard javadoc corrections