Merge "Fixup a comment." into jb-mr1-dev