Typo and lint fixes
Merge pull request #11391 from techhat/cloud

Typo and lint fixes