Merge "Fix typo in comments." into pi-dev