Merge "fix typo in code sample" into jb-mr1.1-ub-dev