Merge "Fix doc typo." into jb-mr1-dev