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