Merge "Update comments to reflect what the code actually does" into jb-mr1-dev