Merge "fix common typos as part of codelab" into main