Merge "Doc change: edits to highlights files." into jb-mr1-dev