Merge "Fix comment typo in HwModule" into main