Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev