Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs