Merge "cleanup: fix typos in logs"